Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 24 Oct 2011 17:14:04 +0000 (10:14 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 24 Oct 2011 17:14:04 +0000 (10:14 -0700)
commitef4d9d4f848278cf96d4136aca0806c883d02395
tree00d7dfc9d34a906a8e27b40b9e07ad3acdb821b2
parent986b24d84c19f14a3937e5688947f685e405d7a0
parente0268852410e0d56d6335939cb1b242f7d3d8fea
Merge from trunk.